some clean up, things might have broken