Clean up and removed offline player support