Remove unused code from step def