Remove data-default dependency