some more cleanups

:PpPpPPPpppPPPPPpP