Contiued Cleaning extensions.  Removed redundant enumerable fluent types.