cleaned up debugging output and commented-out code