Cleaning up according to the new factorization.