Clean up episode model code