Making logic changes to remove dependencies on Bundle A,B,C