Remove safe buffer

closes #2