some defuns are not necessary now that all is in single file