some cleanup of the angular/di stuff