Remove useless functions, keep some as internal-only.
Use internal fn.