Remove dead macro code