Remove nils to avoid mistakes