Remove some macro spam

Yay for multi-item macros!