Still trying to remove valgrind...