Can we remove the commented code after we transfer over to Apache please?