Remove qpid_* from controller.pp (again)