Some cleanup, stopped user from reordering the columns