Update FM flags and remove old flags