Remove buffersize hack