Remove a few accidentally committed lines, rearrange, update status