Removing some old code and changing to newer versions.