Removed 'step' variables