Some cleanup from makeing the 2.10 version