Merge branch 'removed'