cleanup function
applying cleanup
deleting old code