NTFY-96: Add type to barrel.agent and remove values that are no longer needed/valid