clean up terms, drop some complexity