Refactoring of step definitions, especially in user_steps

Also cleared out a lot of commented code.