removed redundant handler code