Tidy up supporting page steps (squash into c158dc0)
Remove unused cucumber steps