code cleanup

collaborators is working - no support for email yet.