Removed first of no doubt many valgrind complaints