Cleaned up save manager