*8825* Plugin installation cleanup