Dropped sort class from the core