more warnings
Removed unnecessary defines