Eric's cleanup after merging