Removed app specific code