[#18] Conversion - remove commented code