Moro todoes
Cleanup