Merge "Remove forced alignment code."