Remove 'sqlparse' as requirement
Update project package
Remove old implementation
Initial commit of rewrite
Merge branch 'next'