Removing package_component logic