Clean up where stmt