get rid of types_pkg
get rid of oneshot