move last of chef-related from server into plugin