Remove demo code
Add barrel interaction