TUP-2107 Refactor Updates

About the refactor updates, need merge and validate to master.

all the p2 bundle should be removed from the required bundles