more views cleanup