Removed remnants of Moira.
Minor optimizations.