some updates for cleanup