Remove use of global app() function
Cleanup