Reorder and remove code.