cleanup and remove unused steps