Remove Serverlist & Bugfixes