Starting to remove old cruft from the code.