Clean up a little more of the SQL stuff