Removed unrequired files and also updated the charset when decoding the buffers