Removed coalesce remnants
Modified some of the unittests
Moved the generators to new system