removing unnecessary #defines. Part of FW-7.