Revert "Achievements improvements"

This reverts commit c9a0a55d233c4b905a148be5345552f136a4244e.