Remove unnecessary #def's