[BREAKING] Fix issues related to ownership, added cleanup option