Removed unused macro_rules