Remove unused method
Fix bug where first available step gets assigned twice