Revert "Prepare for the Achievement Object. Better design."

Reverts joeygallegos/ClarityAPI#1