API cleanup (closes #2728920) [in-progress]