cleaned up App.whatever antipatterns