remove dependency and refactor