remove steps from query4 implementation