Removing problematic use of 'boy'