Actually Use Improved Cleanup + SQLMaker#insertUser