More memory footprint reductuions