removed unneeded package and subpackage tags