Removed redundant sorting and supergenerators handling strategies