added first attempt of removeMode