Remove left over code
Add property to track zoom factor