Cleanup in Server class
Add getServer to console command sender, remove Server.instance