Add debug forms to macros and remove unused macros