Removing additional unnecessary code