removed unnecessary #ifs