Remove & Sort, clean solution