Further cleanup of advanced ORG features for better Github compatibility.