Updated using new Episode classes

Updated to use new Episode class and did some code cleanup of legacy
code