Removed old/redundant code