Cleanup of base app, slightly customized