Clean up the Moga interface to begin diagnosing breakage