Clean up, remove deprecated modules.