Clean up BufferedChunk.java