Removed unnecessary #ifdef