more small cleanup
remove func