Issue/1 - Remove hardcoded email overrides