Shell cleanup