Cleaned up defines.h