Refractored various things,deleted Achievements