Removed some unused code