Smart Essential Commercial Package-clean up

Smart Essential Commercial Package-clean up