fixing and cleaning AFCR merge