Cdoe clean up