added mechanism to clean the owner