Removed obsolete bits.