Remove unneed & add missing libs