remove unnecessary #defines