Refactoring.  Got remove command working again and looking at the dependency graph.