clean up a bit more before more refactors