removed comments on fixed bugs and commented-out legacy code