API cleanup and consolidation.