updated and certified changes

need to do a code clean up before master release.
removed file that was not needed