Removed binaries
More some optimization