Simplified the memory footprint.