Cleanup of several chunker classes