added support for post-removal