Added remove unnecessary code