Minor cleanup from old code