Change notation and remove uneeded dependencies.