Remove dependence on core classes for tests
Remove demo
Remove redundant IIFE