Components now appear to be removing properly.