The beginning of some cleanup.