Clean up some module mess
Cleaning up some unneeded and partial additions accidentally introduced in !6816 (merged).
Backport: release
Edited by Cory Quammen
Cleaning up some unneeded and partial additions accidentally introduced in !6816 (merged).
Backport: release