Cleaning up sheet queries