clean up parse fake data methods
merge conflict