Removed old and unsued code