Correct removing was implemented