Old commented code removed