deleted more unnecessary code