Removing unnecessary #defines in widget