some updates around cleaning up