Updated to free old data (not thread safe, but also not used at the moment) and minor cleanups for CVFS obsfucation