Removing a few more @package tags