remove obsolete module
Merge branch 'next'