removed all the friend crud code, clean up..