remove and reorder some stuf