Remove unused #define's
Convert last(?) enum's to bitshifts