Got rid of obsolete view modes

also remove folder - within folder nonsense