Finish SQL Importer
Code analysis cleanup