Remove old deprecated modules from the system
Module Builds
Merge branch 'dev-3.x' into remove-deprecated