few func_ cleanups