Remove moment from Step2, Step3