AwA alignment clean-up.