Remove DefaultingTypesafeContainer, we no longer need it