Brocfile clean up

Same as above.