Commented code cleanup, preparing for SimMobility library approach.