Some cleanup and final commit by now