Removed some dead code from ancient times!