Remove buffered methods for now