Get rid of plist dependency everywhere.