Removed demo classes and code added by archetype