Removed a redundant macro and unused template.