Tranings views cleanup