cleanup of old function names, documentation