- removed some unnecessary commented-out test codes