Remove dead code
Add third party libs in the feature