Fixed removal bug in simulate