yet another cleanup

still not ready