OPD fix remove unused steps