Merge branch 'jc/clean'