Remove this
Clean up detection of library path