Removed old & unnecessary code