Core/Achievements: Removal part 2