Remove unused commented out codeg