forgot post_remove in previous commit