Remove context adaptation code