Cleaned out unused imports, minor factoring in Datastream