remove package and subpackage annotations closes #519