Remove unused fields, redundant checks, and fix issue where compoosite transitions are not cloned properly