added paperclip; removed macros