r421 - Config update, remove unneeded codes
Fix