Remove excess code
Remove on zoom handler and more cleanup
Move zooming out of handler and into composer as first step refactor