Removal of old, unused code.