aggregate fixity
Merge branch 'master' into agg-fixity

* master:
  Cleaned up unused imports