Re-implemented removed classes and fields used in Controller, and made them obsolete/deprecated.