Merge branch 'cygnus-remove'