More Brocfile cleanup