Remove various unused macros
Moar warnings (and fixes for same)