Removed old SQLParser
Added and fixed comments