LCM: Removed map from topology class that is no longer needed. Other
minor changes.