deprecated and unused methods removed
remove unused import
code formatting, clean-up unused code
code formatting
Merge pull request #206 from pisaychuk/master

CleanUp and formatting