removed redundand code