CORE-221 - Removed manywho specific references that were hardcoded