Merge branch 'jc/partial-remove'