Remove phonon and other changes