updated changelog and removed commented-out code