Removed some unused old code.