- Even more cleanup of mcutil patch