Remove unused functions h/t @sloria
Remove unused import and some triangles
Merge branch 'feature/s3-keys' into develop