Removed old leftover code