Removed some unnecessary ToDictionary methods