Adding cleaning up Figures