Doing some cleanup
some cleanup