clean up code reduced inference
clean up code reduced inference
Merge pull request #154 from joergkappes/master

Clean up code