Remove references to functions that no longer exist
Fix sphinx build warnings