Clean up app_core
Switch  for .ready
Merge pull request #1056 from lonelyplanet/if-app-core-cleanup-part-two

Clean up app_core