Remove save step from some screens