Yet more stuff that I swear i removed already (time to stop trusting
EGit merge...)