Clean up

Removed extra elements and allied auto layout for use with iPhone6, etc