MapGuide-proof our identifiers
Remove some dead code
Remove more dead code
Fix WCS on data import screen