Old commented out code removed