removed unneccesary fetch code