Fixing naming of config option
Getting some speed back from older changes
DRUP is no longer ever #define-d