Remove FPS and style changes.
Merge branch 'master' into zusehub-ios