Remove more hardcode buffer value to dymatic buffer.