deleted unessecary excpetion handling