Yet another leader dot question and related for TOC

Question

I asked a question yesterday. Thanks for the help. It turns out I only need to remove the leader dots AND the page number associated with "CHAPTER". This is using the memoir class and also uses a .sty file. I know this is not a minimal working example, but I don't know which line(s) of code are the problem. I have messed with them all...

Here is the main file

\documentclass[oneside,12pt]{memoir}
\usepackage{pw1} 
\begin{document}
\tableofcontents*
\addcontentsline{toc}{chapter}{CHAPTER}
\chapter{blah}
\end{document} 

Here is relevant stuff in the pw1.sty file

\let\oldtoc\tableofcontents
\renewcommand{\tableofcontents}{\clearpage\pagestyle{toc}}\oldtoc}
\renewcommand{\contentsname}{TABLE OF CONTENTS}
\renewcommand*{\tocheadstart}{\vspace*{-\topfiddle}}
\renewcommand*{\aftertoctitle}{\thispagestyle{plain}%
    \par\nobreak \mbox{}\hfill{\normalfont Page}\par\nobreak}
\renewcommand*{\cftchapterfont}{\normalfont}
\renewcommand*{\cftchapterpagefont}{\normalfont}
\renewcommand*{\cftchapterleader}{%
 \cftchapterfont\cftdotfill{\cftchapterdotsep}}
    {\cftdotsep} 
\setlength{\cftbeforechapterskip}{0pt plus 0pt}

This is what I get:

CHAPTER...............................................1

One other problem I am having is that the Chapter on page2 of the TOC is not all caps and needs to be. This one should be simple, but...

Chapter

Answer 1

If you need to remove the chapter page numbers, then

\renewcommand\cftchapterformatpnum[1]{}

is what's needed. To get automatically uppercased titles, I found out this hack:

\usepackage{etoolbox}
\makeatletter
\patchcmd\l@chapapp
  {\hskip-\memRTLleftskip}
  {\hskip-\memRTLleftskip\MakeUppercase}{}{}
\makeatother