6.2.0 cleanup so Sebastiaan can review it...

Just to you can make a diff... then let me know and I'll push the whole thing by myself.