Continued to address the phantom remove bug.