More SQL simplification