Took Valgrind stuff out