REL-1501: Some necessary cleanup.