Defconfigs cleanup