Remove direct references to external libraries