Brocfile clean up