Clean Up

Clean up of files. Graphs are working well