Removed all dangerous string buffers