xtend-gen cleanup