Package/packaged declaration clean up