added waitFor on remove