Fixes to the merged version, delete generated files