Removed unused code
removed properties
Merge pull request #1 from arznboy/qa

Qa