Cleanup codebase
remove functions support
change namespace and primary call