better testability and tests
removed binaries