Lots of changes while getting rid of dependencies.