Remove previously deprecated modules
Land #3284, deprecated module cleanup