Remove blinking and fix bug when disabling discipline and etc.