views cleanup, startup time improvements