Removed app list dependency and debugging code