Fixing save
Remove dead code.