Remove useless stubs
Merge branch 'Reference-swapper-dev'