Some cleanup from old code