Fixing Situate bugs with cleaning and situating without a package_info.