update code, remove dependency