MJ: views cleanup