Remove obsolete #define's