Remove unnecessary libraries
Finish final version