General: Unused views cleanup