General SaveController cleanup