various clean up