More Consolidating and cleaning