Removed app global variable dependency