Idea cleanup #2