Clean up USMap subtargets