minor cleanup of dependencies, TODO added.