Remove old Encoder-Decoder stuff
Make batch trimming optional
Finish batch trimming commit