clean-up seems to not have broken anything