Added removing of buffer space.