Minor Payment refactoring (cleanup unused ErrorCode)