issue58: cleaning out commented code that is no longer needed