Revert "Amended some SQL related items"

This reverts commit 41c8029ffa44a811a6112cdaf8dbe81a99ee7f9d.