dispose methods added to dev branch