removing obsolete/commented code