Buffer: Removing unused code