Removed s3-gem
Removed unused code
Added unicorn