[development] Contrib module clean up - Status report