Merge branch 'ss/builtin-cleanup'