Merge pull request #4339 from TRodziewicz/remove_depr_error_codes

Remove deprecated error codes.