FIX typo and remove unnecessary code