Remove dead code causing gcc 4.9.1 not to compile
Remove requirement of using LD_LIBRARY_PATH