code cleanup/rogue tree adds?