removed useless previous remove calls