Removed App.whatever antipatterns