CONN-610:Clean-up unwanted steps