Removing some stuff that I don't need and making naturalSort an internal dependency