Better cleanup, this package can now be removed after it is applied as it only need to be applied once.
