Remove useless libs, add some more stuff