Added missing libraries, remove unused