removed app specific code