fixes for removing things