remove unused stuff and refactor for coverage