cleaned out the rest of the sub-type views. not tested yet