Cleaning up sql package.