clean up friendship

remove old commented-out lines.
make whole-class friendship heirarchy.