Remove extra shifts and deal fine with multiple options