Clean up
App skeleton