Removing the multi package_component logic