LPS-47366 Removes buffer on expando