Continuation of clearing the files

This is the continuation of cleaning the NNN files to create our simulator