Upcase SQL keywords
remove unneeded method