temporarily removes paperclip features; refactors code