Some more cleanups/dep changes onclean build