removed SaveChoice class (was useless)