Removing buffer based on previous testing.