clean up some files
added some roles functions