Set default composition to dyn, remove deprecated props