cleanup removal of paperclip code