Changed waiting for removal mechanism to be more r_t idiomatic.