Removed some outdated code fragments.