fixed things to work for cleanup branchf