Removed some unsued code