Remove use of Agent in Manufacturer spec and clean up slightly