Cleanup (Client)

You will have to undo my commit 5e62998, it would take to long for me to upload that. Idk if github supports ignoring a commit when merging.