simplification and remove of outdated code
Merge pull request #28 from outbounder/master

simplification and remove of outdated code