Fixed comment
Add support for removing objects