Removed ifeq nonsense