remove pseudo-package and inline the actual code