#311 Removing all OG references in features and code