removed redundancies outdated by tap method and deleted antiqued code