Removed debug code.
First step in swap to paperclip