mojo: Misc cleanup