cleanup some moe