More cleaning, dependencies still broken.