Removing unneeded confirmation subclasses and fixign views