Removed hardcoding of work and apps