Removed old log prints + commented out code