remove clobberer stub
use correct namespace_packages
support proxying