Fixed an error with the stepping mechanism and remove some unused code.