Revert "Add barrel mod"

This reverts commit e9142704417704b37d81723340b45f39c0a3ad87.