Removed hardcoded WAEDC-specific codes