moth: Some cleanup