Unnecessary code deleted