Removed cross-world flight check.
Code cleanup.
Removed MetricsLite