Continuing code base cleanup.