Cleaned up some dead-code cruft.