Optimization: remove overkill sort