Spring cleaning to support newer versions