Merge "Removing the initialising the mode with system pref mode."