Removed external/binary stuff