Cleaning up system add-on sorting