Clear out stale dependencies, fix log4cxx dependency, bug fixes.