some library simplification.
some library simplification.