Removed stateless steps