Tried to clean up the libs again.