Minor cleanup of unnecessary code