Did interpret this file wrongly.
Removed some of the valgrind warnings in this class.