- Removed obosolete workaround for sorting class