Remove non ansi standard SQL in preparation for supporting multi DBMS