Some cleanup. More to come.