Clean-up of the virtual/kernel recipe