remove the raw sql pretty much