Remove one unused and one unnecessary macros