Removed old unnecessary code