Fix for #634 Validate supercollection
Code cleanup