More newbie cleanup