Deleted more unnecessary code