clean up warnings
clean up warnings