Some unnecessary code deleted