adding expunge
fixing bad relationship data