refs #3, remove commented code