Removed old cruft from the code.