Remove local helpers
Refactor lib inclusion in Brocfile
fixup
fixup