Remove hledsp tags to ensure we won't get Mercury-specific manifests running around.
Fix leftover debug code. (That changes diff sure helps in finding weird stuff.)