version bump of some deps and code cleanup