removing dependency on OrderedDict, fixed issue with super() call on init