removed extra handlers