Cleanup & Update defconfig