Removed some unused code.