ENH: Some remote module cleanup