Remove long deprecated commented code