Step_X/Y removal

Let's hope it compiles!