update and removed code