some clean up before alex edits