Drop some unnecessary props and add some new ones