Removing data-default dependency