Further save cleanup