cleanup of unit instantiations
Merge branch 'master' of https://github.com/zudijyr/tiletrade