Merge branch 't/cleanups'