Cleanup, move demo code outside of core mixins