More ideaj cleanup