Additional steps towards removal of old tags code from report package