Remove some dependencies that were integrated and stabilized in the STD. Use some new stabilized features.