Changing to line based decoder, removing unused.