Some SQLs rewritten, unneccessary parameter removed