remove extra code
removed obsolete usings
small cleanup...
Merge pull request #24 from SlavaRa/development-linux-issue21

closes: issue #21