[michael] Cleanup fixing