Updated demo code

removed unused method in Extensions. removed unused classes