Removed sample app specific code