CleanUp Methods

Added CleanUp methods,
Done begins Setup data gather.