Remove two old modules kept for HTML backwards-compatibility

Both should be safe to remove now.

Change-Id: I88bfb1fb3ccb74be872a6e64fc031ece48d002ce
Merge "Remove two old modules kept for HTML backwards-compatibility"