remove some defines for temp fixes that were coming in from main in the...

remove some defines for temp fixes that were coming in from main in the previous merge, clang-format