Removed accidental checkins and tweaks to complete the app-izing