removed redundant work