old code deleted
Refactor demo project