Remove more code that has become useless after the pairless MBAFF loop