removed extra unnecessary code