Last minute clean up

Last minute clean up