Remove function decl and prefix accidental builtin overrides